Merge remote-tracking branch 'savannah/master' into clean-up

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/print.c
Simple merge